amd iommu: Fix HV crash with 32bit pv_ops kernel

Signed-off-by: Wei Wang <wei.wang2@amd.com>
Tested-by: Conny Seidel <conny.seidel@amd.com>

diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
index e2795f52cf91e6e8f2979e14c1decd9a40a1f4a2..e414b1446f71ee85d9ba91056dada0e6fdcd266f 100644 (file)
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
@@ -31,9 +31,6 @@
 
 #define DMA_32BIT_MASK  0x00000000ffffffffULL
 
-extern int amd_iommu_debug;
-extern int amd_iommu_perdev_intremap;
-
 #define AMD_IOMMU_DEBUG(fmt, args...) \
     do  \
     {   \

diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 003fd7625db2afc36f8fb20a61abfdd6ed186a61..f516bcca162dac96968d1119deafa93987447a51 100644 (file)
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -30,6 +30,8 @@ extern bool_t iommu_enabled;
 extern bool_t force_iommu, iommu_verbose;
 extern bool_t iommu_workaround_bios_bug, iommu_passthrough;
 extern bool_t iommu_snoop, iommu_qinval, iommu_intremap;
+extern bool_t amd_iommu_debug;
+extern bool_t amd_iommu_perdev_intremap;
 
 extern struct rangeset *mmio_ro_ranges;